ARM: rmobile: Allow R8A7796 Salvator-X configuration

The Salvator-X can have both H3 and M3 CPU on it, drop the
select R8A7795 to allow both configurations.

Signed-off-by: Marek Vasut <[email protected]>
Cc: Hiroyuki Yokoyama <[email protected]>
Cc: Nobuhiro Iwamatsu <[email protected]>

diff --git a/arch/arm/mach-rmobile/Kconfig.64 b/arch/arm/mach-rmobile/Kconfig.64
index 4ffc40edc6ebeaf1c745df8ba728a34bf3721c49..5db93ac8d65d09652fa6d0ac7b5b4a41902d6c87 100644 (file)
--- a/arch/arm/mach-rmobile/Kconfig.64
+++ b/arch/arm/mach-rmobile/Kconfig.64
@@ -17,9 +17,8 @@ choice
 
 config TARGET_SALVATOR_X
        bool "Salvator-X board"
-       select R8A7795
        help
-          Support for Renesas R-Car Gen3 R8a7795 platform
+          Support for Renesas R-Car Gen3 platform
 
 endchoice
 

diff --git a/configs/salvator-x_defconfig b/configs/salvator-x_defconfig
index b1500296da202db38a8f7558bf1be7f5ad59d1f5..8f9b5b53280ae977d10f5f61510802318417f36d 100644 (file)
--- a/configs/salvator-x_defconfig
+++ b/configs/salvator-x_defconfig
@@ -5,6 +5,7 @@ CONFIG_RCAR_GEN3=y
 CONFIG_TARGET_SALVATOR_X=y
 CONFIG_VERSION_VARIABLE=y
 CONFIG_CMD_BOOTZ=y
+CONFIG_R8A7795=y
 # CONFIG_CMD_IMI is not set
 # CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_XIMG is not set